merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Fri, 6 Apr 2007 16:08:30 +0000 (10:08 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Fri, 6 Apr 2007 16:08:30 +0000 (10:08 -0600)

Trivial merge